Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixosTests.nixos-rebuild-specialisations: Fix #237069

Merged
merged 1 commit into from
Jun 10, 2023
Merged

nixosTests.nixos-rebuild-specialisations: Fix #237069

merged 1 commit into from
Jun 10, 2023

Conversation

roberth
Copy link
Member

@roberth roberth commented Jun 10, 2023

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jun 10, 2023
@roberth
Copy link
Member Author

roberth commented Jun 10, 2023

@ofborg test nixos-rebuild-specialisations

@roberth roberth requested a review from RaitoBezarius June 10, 2023 16:43
@roberth
Copy link
Member Author

roberth commented Jun 10, 2023

Fixed for linux, but why does it fail on arm? @RaitoBezarius is this also due to disk handling changes?

machine # Installing for arm64-efi platform.
machine # /nix/store/v25ypi8bj8ahg1l9vsba6mcyl12wp406-grub-2.06/sbin/grub-install: error: cannot find EFI directory.
machine # /nix/store/18w2h1dx2ljd324kzddwr49v5s09aiay-install-grub.pl: installation of GRUB on /dev/vda failed: No such file or directory
machine # warning: error(s) occurred while switching to the new configuration
machine: output: 
Test "Switch to the base system" failed with error: "command `nixos-rebuild switch` failed (exit code 1)"

(see ofborg, https://github.com/NixOS/nixpkgs/pull/237069/checks?check_run_id=14158223935)

RaitoBezarius
RaitoBezarius reviewed Jun 10, 2023
View reviewed changes
nixos/tests/nixos-rebuild-specialisations.nix
stdenv
sudo
xorg.lndir
system.includeBuildDependencies = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this make the closure explode? :-(

I mean I dream of using this everywhere (while waiting for rebuildDependencyClosure which @JulienMalka is exploring).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the build closure ;)

It balloons, but does not explode.
Right now the test itself explodes. Pieces everywhere.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JulienMalka

Awesome!

Added some thoughts here #180529 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So realistically I think our priorities should be

  1. maintainable tests
  2. working tests
  3. fast tests

This PR doesn't make (3) harder, because it's easy enough to find tests that do includeBuildDependencies = true.
Meanwhile it fixes (1) and (2).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm on board with the "correct by design".

@RaitoBezarius
Copy link
Member

Fixed for linux, but why does it fail on arm? @RaitoBezarius is this also due to disk handling changes?

machine # Installing for arm64-efi platform.
machine # /nix/store/v25ypi8bj8ahg1l9vsba6mcyl12wp406-grub-2.06/sbin/grub-install: error: cannot find EFI directory.
machine # /nix/store/18w2h1dx2ljd324kzddwr49v5s09aiay-install-grub.pl: installation of GRUB on /dev/vda failed: No such file or directory
machine # warning: error(s) occurred while switching to the new configuration
machine: output: 
Test "Switch to the base system" failed with error: "command `nixos-rebuild switch` failed (exit code 1)"

(see ofborg, https://github.com/NixOS/nixpkgs/pull/237069/checks?check_run_id=14158223935)

Looks like a bug/problem in GRUB installer script again, I think. But of course, my disk changes could have make this bug "visible" again.

I assume the target for GRUB device should be nodev to make this work on UEFI, otherwise, it needs legacy boot.

@roberth
Copy link
Member Author

roberth commented Jun 10, 2023

Looks like a bug/problem in GRUB installer script again

Can't really dive into that now.

@roberth roberth merged commit 5eb2425 into NixOS:master Jun 10, 2023
@roberth roberth mentioned this pull request Jun 10, 2023
Merged
12 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jun 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaitoBezarius RaitoBezarius RaitoBezarius approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@roberth @RaitoBezarius